From 14ad26a599819e19cda38fe8008599e46971dedf Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 27 Mar 2019 18:40:40 -0400
Subject: [PATCH] Convert ui files

Run gtk4-builder-tool simplify --3to4 over all ui files.
---
 tests/popover2.ui | 153 ++++++++++------------------------------------
 1 file changed, 32 insertions(+), 121 deletions(-)

diff --git a/tests/popover2.ui b/tests/popover2.ui
index 2e406fb751..23d8098e67 100644
--- a/tests/popover2.ui
+++ b/tests/popover2.ui
@@ -1,13 +1,10 @@
-<?xml version="1.0"?>
 <interface>
   <object class="GtkPopoverMenu" id="popover">
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="margin-start">12</property>
             <property name="margin-end">12</property>
@@ -15,7 +12,6 @@
             <property name="margin-bottom">3</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="halign">start</property>
                 <property name="label">Edit</property>
                 <style>
@@ -24,38 +20,30 @@
               </object>
             </child>
             <child>
-              <object class="GtkSeparator">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-              </object>
+              <object class="GtkSeparator"/>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.cut</property>
             <property name="text">Cut</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.copy</property>
             <property name="text">Copy</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.paste</property>
             <property name="text">Paste</property>
           </object>
         </child>
         <child>
           <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
             <property name="margin-start">12</property>
             <property name="margin-end">12</property>
             <property name="margin-top">3</property>
@@ -64,28 +52,24 @@
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">action1</property>
             <property name="text">No action</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action2</property>
             <property name="text">Toggle</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action2a</property>
             <property name="text">Another Toggle</property>
           </object>
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="margin-start">12</property>
             <property name="margin-end">12</property>
@@ -93,7 +77,6 @@
             <property name="margin-bottom">3</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="halign">start</property>
                 <property name="label">Middle Section</property>
                 <style>
@@ -102,46 +85,38 @@
               </object>
             </child>
             <child>
-              <object class="GtkSeparator">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-              </object>
+              <object class="GtkSeparator"/>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action3</property>
-            <property name="action-target">'three'</property>
+            <property name="action-target">&apos;three&apos;</property>
             <property name="text">Radio 1</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action3</property>
-            <property name="action-target">'four'</property>
+            <property name="action-target">&apos;four&apos;</property>
             <property name="text">Radio 2</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="text">Submenu 1</property>
             <property name="menu-name">submenu1</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="text">Submenu 2</property>
             <property name="menu-name">submenu2</property>
           </object>
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="margin-start">12</property>
             <property name="margin-end">12</property>
@@ -149,7 +124,6 @@
             <property name="margin-bottom">3</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="halign">start</property>
                 <property name="label">End Section</property>
                 <style>
@@ -158,16 +132,12 @@
               </object>
             </child>
             <child>
-              <object class="GtkSeparator">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-              </object>
+              <object class="GtkSeparator"/>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action9</property>
             <property name="text">Another Item 9</property>
             <property name="icon">icon9</property>
@@ -175,7 +145,6 @@
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action10</property>
             <property name="text">Another Item 10</property>
           </object>
@@ -184,21 +153,19 @@
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
+        <property name="name">submenu1</property>
         <property name="orientation">vertical</property>
         <property name="margin">10</property>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="text">Submenu 1</property>
-            <property name="inverted">True</property>
-            <property name="centered">True</property>
+            <property name="inverted">1</property>
+            <property name="centered">1</property>
             <property name="menu-name">main</property>
           </object>
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="margin-start">12</property>
             <property name="margin-end">12</property>
@@ -206,7 +173,6 @@
             <property name="margin-bottom">3</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="halign">start</property>
                 <property name="label">5555</property>
                 <style>
@@ -215,62 +181,51 @@
               </object>
             </child>
             <child>
-              <object class="GtkSeparator">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-              </object>
+              <object class="GtkSeparator"/>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action5</property>
             <property name="text">Item 5</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action5</property>
             <property name="text">Item 5a</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action5</property>
             <property name="text">Item 5b</property>
           </object>
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
-            <property name="halign">fill</property>
             <property name="margin-top">10</property>
             <style>
               <class name="linked"/>
             </style>
             <child>
               <object class="GtkModelButton">
-                <property name="visible">True</property>
                 <property name="text">List</property>
                 <property name="action-name">top.set-view</property>
-                <property name="action-target">'list'</property>
-                <property name="iconic">True</property>
-                <property name="centered">True</property>
+                <property name="action-target">&apos;list&apos;</property>
+                <property name="iconic">1</property>
+                <property name="centered">1</property>
                 <property name="icon">icon-list</property>
               </object>
             </child>
             <child>
               <object class="GtkModelButton">
-                <property name="visible">True</property>
                 <property name="text">Grid</property>
                 <property name="action-name">top.set-view</property>
-                <property name="action-target">'grid'</property>
-                <property name="iconic">True</property>
-                <property name="centered">True</property>
+                <property name="action-target">&apos;grid&apos;</property>
+                <property name="iconic">1</property>
+                <property name="centered">1</property>
                 <property name="icon">icon-grid</property>
               </object>
             </child>
@@ -278,21 +233,18 @@
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action5</property>
             <property name="text">Item 5c</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action5</property>
             <property name="text">Item 5d</property>
           </object>
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="margin-start">12</property>
             <property name="margin-end">12</property>
@@ -300,7 +252,6 @@
             <property name="margin-bottom">3</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="halign">start</property>
                 <property name="label">Format</property>
                 <style>
@@ -309,58 +260,48 @@
               </object>
             </child>
             <child>
-              <object class="GtkSeparator">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-              </object>
+              <object class="GtkSeparator"/>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
-            <property name="halign">fill</property>
             <property name="margin-top">10</property>
             <style>
               <class name="linked"/>
             </style>
             <child>
               <object class="GtkModelButton">
-                <property name="visible">True</property>
                 <property name="text">Bold</property>
                 <property name="action-name">top.bold</property>
-                <property name="iconic">True</property>
-                <property name="centered">True</property>
+                <property name="iconic">1</property>
+                <property name="centered">1</property>
               </object>
             </child>
             <child>
               <object class="GtkModelButton">
-                <property name="visible">True</property>
                 <property name="text">Italic</property>
                 <property name="action-name">top.italic</property>
-                <property name="iconic">True</property>
-                <property name="centered">True</property>
+                <property name="iconic">1</property>
+                <property name="centered">1</property>
                 <property name="icon">icon-italic</property>
               </object>
             </child>
             <child>
               <object class="GtkModelButton">
-                <property name="visible">True</property>
                 <property name="text">Strikethrough</property>
                 <property name="action-name">top.strikethrough</property>
-                <property name="iconic">True</property>
-                <property name="centered">True</property>
+                <property name="iconic">1</property>
+                <property name="centered">1</property>
                 <property name="icon">icon-strikethrough</property>
               </object>
             </child>
             <child>
               <object class="GtkModelButton">
-                <property name="visible">True</property>
                 <property name="text">Underline</property>
                 <property name="action-name">top.underline</property>
-                <property name="iconic">True</property>
-                <property name="centered">True</property>
+                <property name="iconic">1</property>
+                <property name="centered">1</property>
                 <property name="icon">icon-underline</property>
               </object>
             </child>
@@ -368,7 +309,6 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="margin-start">12</property>
             <property name="margin-end">12</property>
@@ -376,7 +316,6 @@
             <property name="margin-bottom">3</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="halign">start</property>
                 <property name="label">6666</property>
                 <style>
@@ -385,119 +324,97 @@
               </object>
             </child>
             <child>
-              <object class="GtkSeparator">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-              </object>
+              <object class="GtkSeparator"/>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action6</property>
             <property name="text">Item 6</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action6</property>
             <property name="text">Item 6a</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action6</property>
             <property name="text">Item 6b</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action6</property>
             <property name="text">Item 6c</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action6</property>
             <property name="text">Item 6d</property>
           </object>
         </child>
       </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
+        <property name="name">submenu2</property>
         <property name="orientation">vertical</property>
         <property name="margin">10</property>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="text">Submenu 2</property>
-            <property name="inverted">True</property>
-            <property name="centered">True</property>
+            <property name="inverted">1</property>
+            <property name="centered">1</property>
             <property name="menu-name">main</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action7</property>
             <property name="text">Item 7</property>
           </object>
         </child>
         <child>
           <object class="GtkScale">
-            <property name="visible">True</property>
-            <property name="draw-value">False</property>
+            <property name="draw-value">0</property>
             <property name="adjustment">adjustment</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="text">Subsubmenu</property>
             <property name="icon">icon9</property>
             <property name="menu-name">subsubmenu</property>
           </object>
         </child>
       </object>
-      <packing>
-        <property name="submenu">submenu2</property>
-      </packing>
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
+        <property name="name">subsubmenu</property>
         <property name="orientation">vertical</property>
         <property name="margin">10</property>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="text">Subsubmenu</property>
-            <property name="inverted">True</property>
-            <property name="centered">True</property>
+            <property name="inverted">1</property>
+            <property name="centered">1</property>
             <property name="menu-name">submenu2</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">action8</property>
             <property name="text">Item 8</property>
           </object>
         </child>
         <child>
           <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
             <property name="margin-start">12</property>
             <property name="margin-end">12</property>
             <property name="margin-top">3</property>
@@ -506,22 +423,17 @@
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action9</property>
             <property name="text">Item 9</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
             <property name="action-name">top.action10</property>
             <property name="text">Item 10</property>
           </object>
         </child>
       </object>
-      <packing>
-        <property name="submenu">subsubmenu</property>
-      </packing>
     </child>
   </object>
   <object class="GThemedIcon" id="icon9">
@@ -543,7 +455,6 @@
     <property name="name">format-text-underline-symbolic</property>
   </object>
   <object class="GtkAdjustment" id="adjustment">
-    <property name="lower">0</property>
     <property name="upper">100</property>
     <property name="value">50</property>
   </object>
-- 
2.30.2